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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I707bfb48e98ec187543e6fd77c08a410f0dd4c82