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

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

Change-Id: I0feac28d8b69992e31c9d710bcc8f6e8c5046565