Merge changes from topic "am-c7ae5aac1ddb4a3497131b161eb48568" into main am: 1bc29898

Original change: https://android-review.googlesource.com/c/platform/build/+/3196091



Change-Id: I2e3d19370c42d72171449b9b4d37945e15ce45bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>