[automerger skipped] Merge changes I33b70b0a,I1074eedb am: 8818498877 am: 5ab9ebb883 -s ours am: f1ac1eddad -s ours am: 371cab2454 -s ours am: 29d81e4d26 -s ours

am skip reason: Change-Id Icd141a992c46290c74929785e261a1cd57bc001b with SHA-1 2e342b8676 is in history

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

Change-Id: Ice038957c1a18e1a978362309adeef798b6223bf
tree: a16f109ca0e7b55f4a6ac4103d9b88139c64e916
  1. Tethering/