[automerger skipped] Merge "DO NOT MERGE: Disable ENABLE_DYNAMIC_PERMISSIONS...

[automerger skipped] Merge "DO NOT MERGE: Disable ENABLE_DYNAMIC_PERMISSIONS without helper method." into rvc-qpr-dev am: 03b88671 am: 4ead09d0 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I0fe7d58603a12f4606b916d92fa1399e22893567