Merge "Clean up cc_test TEST_MAPPING after default update" am: 3420e32b3f

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1597072

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icf5bcd3a507a6e2e23c48a589d77755b6f21d9c6