Merge "Use inclusive language in framework core test APKs" am: a715792f5c am: 6b1799323e am: 13d34cbd5e

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

Change-Id: Iead939405084a422f9b8965bd65fd12ecb4a9e92