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

* changes:
  [automerger skipped] Merge changes I655211e0,Ifaecb49a into rvc-dev am: a89c6163 am: e7326cf9 -s ours am: 8a3e7c6a -s ours
  [automerger skipped] Set min_sdk_version for updatable mainline modules am: fc02525f am: e4972a9f -s ours am: 31af4a0e -s ours