tree 126912f4882e9488d6abe54afbaa48abbb7e0cb0
parent 261c1dc4e702bf48f655c9ade0b5891f7e3edc67
parent 77de09efd5da90de813e4821cbdb0fcde61ea8b4
author TreeHugger Robot <treehugger-gerrit@google.com> 1593705366 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1593705366 +0000

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

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

Change-Id: I056479d73f9e8977c404f64005618d11878fee0e