Merge changes from topic "am-fbf760d15b9847d0a81afc48aec25dc1" into rvc-qpr-dev-plus-aosp

* changes:
  [automerger skipped] Merge changes I655211e0,Ifaecb49a into rvc-dev am: a89c6163aa am: 753d22c70b -s ours am: dee013a522 -s ours
  [automerger skipped] Set min_sdk_version for updatable mainline modules am: 5f9f31c18b am: d261c58a4a -s ours am: ae8111e687 -s ours
tree: 1babb1db341de1fd7a72132a91fbf8c92cd6fada
  1. Tethering/