Merge changes from topic "nonabrevert" into main am: 80b1a3fc am: 795ffffd am: 0f6414aa

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



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