Merge "Merge "Make framework-permission stubs use the new defaults" into...
Merge "Merge "Make framework-permission stubs use the new defaults" into rvc-dev am: 1d323e98 am: 124a08cd" into rvc-d1-dev-plus-aosp am: 71f1973c am: 2184da3a
Change-Id: Idf1e8f673ba4b47937c2eeca5e782e3c29736ab4