[automerger skipped] Merge changes from topic "sdk-refactor-tmd" into tm-dev...

[automerger skipped] Merge changes from topic "sdk-refactor-tmd" into tm-dev am: e59bd2aa -s ours am: 15d43ba7 -s ours am: 8f2834a7 -s ours am: 70fc4d04 -s ours

am skip reason: Merged-In I940655c39a3ae58839521416abafaf461df44921 with SHA-1 af948542 is already in history

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



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