tree 1e83a1d7e9138dd2b4693199c757815e7ab15331
parent 976b9f84a0833cd7d29a5d797068f857216e09a3
parent d8d2a0584195c098f919b7a90a1ee6a3c5e1b324
author Sudheer Shanka <sudheersai@google.com> 1610570831 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1610570831 +0000

Merge "Update language to comply with Android’s inclusive language guidance." am: 5eb8de6ed7 am: d8d2a05841

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5470cd0ec05cec7f43d1582876e2c6bde79acc66