[automerger skipped] Merge "Test Mapping: Update test-mapping-group post...

[automerger skipped] Merge "Test Mapping: Update test-mapping-group post platinum split" into tm-d1-dev am: 0de21da9 am: bc6a6e33 am: 8b48d84e -s ours

am skip reason: Merged-In I0f57deb2af3a943fda34d0ecaafb644afc67152c with SHA-1 855d1739 is already in history

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



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