[automerger skipped] Merge "DO NOT MERGE Designate tm-dev* branches as TM."...

[automerger skipped] Merge "DO NOT MERGE  Designate tm-dev* branches as TM." into tm-dev am: 2d0251cf am: 7032be82 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I6ed21702208b623231c733b34ea4a724ff351122