Merge "Clean up cc_test TEST_MAPPING after default update" am: 2c41c142ed

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1597015

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4abb7bc611e8cd07e2000c08d9ebe2a6f3f36376