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

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

Change-Id: If39f0b52f464d491dbf78ed145bdd2c357f53f67