[automerger skipped] Merge "Remove "Blacklist" nomenclature from USB services classes." into rvc-dev-plus-aosp am: 2764ffc4 am: 0fa6dd84 am: d2034fca -s ours

am skip reason: Change-Id I4b3affce57ba61ad9697e91f2a5f63556ee1cd62 with SHA-1 028ffa47 is in history

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

Change-Id: Ib53482db3bc5392132ed5824b8a7a600151079cb