Merge "Flip ENABLE_DYNAMIC_PERMISSIONS, attempt #6." into rvc-dev am: 00c2e16b28

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

Change-Id: I912de41a953377a5a0f0d2666b9c5eab72c637f7