Merge "Merge "Make framework-permission stubs use the new defaults" into rvc-dev am: 1d323e98 am: 124a08cd" into rvc-d1-dev-plus-aosp