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

[automerger skipped] Merge "Merge "Test Mapping: Update test-mapping-group post platinum split" into tm-d1-dev am: 0de21da9 am: bc6a6e33" into tm-qpr-dev-plus-aosp am: 6f75a838 -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: Ia6f467e5a82f7a9ae62556e3dc2b6782cd76c9cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>