Merge "Test Mapping: Update test-mapping-group post platinum split" into...

Merge "Test Mapping: Update test-mapping-group post platinum split" into tm-d1-dev am: 0de21da9 am: bc6a6e33

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19332088



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