Merge "Merge "Flip ENABLE_DYNAMIC_PERMISSIONS." into rvc-dev am: fa01d2ad12 am: acd4ccfc47" into rvc-d1-dev-plus-aosp am: e134a5054a am: e862dc32a8
Change-Id: Ie7253abf71e05dab8cccba81bf63f9902b0c1c15
This commit is contained in: