[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: 1a4f65c3 -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: I963933a80718a7713a44b35834aa2809be85bf59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>