Merge "Merge "Revert "Flip ENABLE_DYNAMIC_PERMISSIONS, attempt #4."" into rvc-dev am: dfb06b858a am: 5100667505" into rvc-d1-dev-plus-aosp am: 026306912c
Original change: undetermined Change-Id: I891fc36c1d2ae522ed7f01421edee983b776dffd
This commit is contained in: