Merge changes from topic "am-510e537a7c34466d8ed3053298cfa958" into main am:...

Merge changes from topic "am-510e537a7c34466d8ed3053298cfa958" into main am: 84aefc94 am: 80c3e721

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



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