Merge "Clean up cc_test TEST_MAPPING after default update" am: d46665bdd7 am: ac38baefa0

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifa40e0cb92af222fc0c0f623d94da300feeb3455