Bug: 70897454 Test: cts before/after patch Change-Id: I511b54e547da63ca2693d05840ff523095c1e303 (cherry picked from commit d71d927f)