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

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



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