Merge "Update comment to use inclusive language" am: 3b7913607b am: 03e5841ec1 am: cb45db0650

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

Change-Id: I4c3d362dd4875f39e5440eec5c7a049c2c8627ac