Merge "Merge "UsbAccessory: Update language to comply with Android's inclusive language guidance" am: 3c127a54 am: 6549bf6d am: 51929ba1 am: 70c8e5b4 am: b23190a0"