[automerger skipped] Merge changes from topic "sdk-refactor-tmd" into tm-dev am: e59bd2aa -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: If1c2d490fd93bfc14b57889907d4ca787631d26f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>