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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12065945

Change-Id: I2333ef565f9f2a199e944361fc207f355ca34c43