Merge changes from topic "am-2b845371bfb24cbda58a356f9712fc87" into main am: f297060a

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



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