Merge "Parent: cc2d51fc (Merge "Update language to comply with Android's...

Merge "Parent:     cc2d51fc (Merge "Update language to comply with Android's inclusive language guidance") Author:     Paul McLean <pmclean@google.com> AuthorDate: 2020-07-28 15:07:26 +0000 Commit:     Glenn Kasten <gkasten@android.com> CommitDate: 2020-08-04 00:06:51 +0000" am: 830c70ad

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

Change-Id: I32f6e92956fc98e60691483f9a6905bbce25c74e