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

* changes:
  Merge "[DO NOT MERGE]Revert "Flip ENABLE_DYNAMIC_PERMISSIONS, attempt #6."" into rvc-dev am: 3d61c82b41 am: 77de09efd5 am: 0979fa6cf1
  [DO NOT MERGE]Revert "Flip ENABLE_DYNAMIC_PERMISSIONS, attempt #6." am: a2127eb446 am: da9943ba2d am: 261c1dc4e7