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