[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 am: 8664fe16 am: ee23802f -s ours am: fa4e65e7 -s ours

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

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



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