Merge "Update language to comply with Android's inclusive language guidance" am: a5d1ef9837 am: 51ded68601

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

Change-Id: Icb2ab0cfc29c8822d5e7f833622fa17357b1bbe9