[automerger skipped] Merge changes from topic "am-ffff7785c46149b19374f45f739e27ab" into main am: d067caa1 -s ours am: 00d74d02 -s ours

am skip reason: Merged-In I01ea97bee5c9502eebda7e09eb617854e1aaf1a8 with SHA-1 0edf97bc is already in history

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



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