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

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

Change-Id: I52cc89f4255c3613a86f91d12bd91a5474dace86