Manual partial cherry-pick of ag/10442796

Original cherry-pick in aosp/1266581 missed some bits. Manually
adding them.

Test: atest --host apexer_test
Bug: 149993331
Merged-In: I5d16097f2827f5d8ab35822d093985b51268e044
Change-Id: Ic592938c64aab4227831c3dd2767c866e91f5d63
1 file changed