Merge "profman: inclusive language updates" am: cde7692843

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

Change-Id: Ib5adcc8d80feefc361f681d9fea50ea3baccfee7