[automerger skipped] Merge changes from topic "am-be6a9190f28c4c1fa3990ea22425f5b8-rvc-dev" into rvc-dev am: 8ef4c5bac0 -s ours

am skip reason: Change-Id I829d36339973f9473fe6b616c48aa288f18d1c46 with SHA-1 269c0886ed is in history

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

Change-Id: I9ce4aead2bd29bcc8226f498bcc0940d04c55319
tree: a518310cfc6bcf99ea9569a5f45126fe4586fc3e
  1. Tethering/