Merge "Fix CtsAppCompatHostTestCases name in TEST_MAPPING" am: 1cd701f143

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

Change-Id: I1ecbb2bf4cc89f866ef695a2cce753542c82dab5