Merge "Update DrmSessionManager to comply with Android's inclusive language guidance" am: 8028dfb98b

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1403167

Change-Id: I883890b91c21a4a0f442633d9486a41396bd4d72