Merge "Update DrmSessionManager to comply with Android's inclusive language guidance"