tree ede8392a5708e10e52afa4e93ee4c77c5d8217a4
parent 70b920489b15cfbf019bc4f5c2ffdd1268608676
parent 19847945d95bcdc5ef24dc0ffcb796140f4283f6
author Treehugger Robot <treehugger-gerrit@google.com> 1595968511 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1595968511 +0000

Merge "Update language to comply with Android's inclusive language guidance" am: feee9563e1 am: d5b8b0db79 am: 19847945d9

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

Change-Id: Ic05b2d1dfbd4de7bdac3d3328f2becbdb18089d4