Merge changes from topic "am-606f4760fe694687b9188f486060d18f" into main am:...

Merge changes from topic "am-606f4760fe694687b9188f486060d18f" into main am: 55ebcbb3 am: a74c3088

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



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