Merge "Use inclusive language in framework core test APKs" am: a715792f5c

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

Change-Id: If057e5ea1a83751e7899019f60a7371f9832c147