[automerger skipped] Merge changes Ibd737c0d,Ibf5a9869 into tm-dev am: 52a97270 -s ours

am skip reason: Merged-In Ibd737c0dd0a35e19529ab08472f4d1bc1195efbd with SHA-1 5c0ec6a5 is already in history

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



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