Merge "DO NOT MERGE: Disable ENABLE_DYNAMIC_PERMISSIONS without helper method." into rvc-qpr-dev am: 03b8867166

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

Change-Id: Ic58653d772ebd3340a4a4eb6bb05a0526ebfb635