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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6369cb59db33e7346bb8af961d101eba852ffa62