[automerger skipped] Merge "Fix CtsAppCompatHostTestCases name in...

[automerger skipped] Merge "Fix CtsAppCompatHostTestCases name in TEST_MAPPING" am: 1cd701f1 am: 7a9e3a57 -s ours am: 45cb939b -s ours am: c8aff235 -s ours am: 4b4bc37a -s ours

am skip reason: Change-Id I6c814fb74ebe566ec3f99e8eff79f98050c8a529 with SHA-1 cb70ae30 is in history

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

Change-Id: Ie2afbf8f7d3c41531098926adca923a8ca11477f