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

am skip reason: Change-Id I829d36339973f9473fe6b616c48aa288f18d1c46 with SHA-1 7c538fa7ff is in history

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

Change-Id: I91792a719a4347485c4b3b411c07e17bcde85947
tree: 0a113a62c525913293638f3749c391f614dcf26f
  1. Tethering/