Merge changes from topic "am-39b53b3019ba4dd38e8861a245803c35" into rvc-d1-dev-plus-aosp

* changes:
  Merge "[DO NOT MERGE]Revert "Flip ENABLE_DYNAMIC_PERMISSIONS, attempt #6."" into rvc-dev am: 3d61c82b41 am: a88ba4ea3c
  [DO NOT MERGE]Revert "Flip ENABLE_DYNAMIC_PERMISSIONS, attempt #6." am: a2127eb446 am: bf5989c341