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

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

Change-Id: Ia7b2e14787dd716af3150fa24a8accff05a8ebc8