Merge "Make framework-permission stubs use the new defaults" into rvc-dev am: 1d323e98 am: 5b6a3bb1 Change-Id: I7b3176673301529d2f92b83b93e8ca8c93ac6cb6