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

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

Change-Id: I867d6778222c0a502b723c94cad740fb725a2ed6