Merge changes from topic "am-c3479d1074da4f49a5c817b8ee7f386a" into...

Merge changes from topic "am-c3479d1074da4f49a5c817b8ee7f386a" into stage-aosp-master am: f6b34d83 -s ours

am skip reason: Merged-In Idccbf36672703b1e9a6b27bf117459284bc7ed26 with SHA-1 de37a0e7 is already in history

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



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