Merge "Make framework-permission stubs use the new defaults" into rvc-dev