Merge changes I5aa04b0c,I9168db08 into main am: ee3b4c119a

Original change: https://android-review.googlesource.com/c/platform/prebuilts/misc/+/3350988

Change-Id: I6b164453315e84f2fc8fbeb906dd2bfe14de1db2
Signed-off-by: Automerger Merge Worker <[email protected]>