[automerger skipped] Merge "Merge ab/6749736 in stage." into stage-aosp-master am: 1b6030e24c -s ours

am skip reason: Change-Id Iecef31f7bf10ad97b7e0075cf302ae94e248474a with SHA-1 539d92beb7 is in history

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

Change-Id: I35256efaa6acc9a9f28371993587f888c1a77252
tree: 280b8aa2f837e5f17c5b62b98a35ee70f5b5a713
  1. Tethering/