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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I955d0fd3498900c1135a63175328b07fdf0b399f