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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic8c67ff3e9c2d7bbb6cf66e6931e209e9fc0f7b2