tree 01fa647a95b6870088b215f122795eeaaadcc704
parent 73dbf80f7ded6f53bbf5cc46d4ac08c11408075f
parent f96b7895f9246b341abb99f91b35ddfd1dbd1b96
author Tyler Gunn <tgunn@google.com> 1596053962 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1596053962 +0000

Merge "Update language to comply with Android's inclusive language guidance" am: ff48dce3c2 am: f96b7895f9

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/1375139

Change-Id: I0efbabdfb4dab680ba5a26a11db4b46094b7fb09