Merge "Make framework-permission stubs use the new defaults" into rvc-dev am: 1d323e98 am: 124a08cd Change-Id: I05314620048f4607a6f887d7071bebbff1abf175