Merge "Merge "Add permitted_packages to framework-permission." into rvc-dev am: 813f173b am: a5007454 am: da8298db am: fc16c14e" into rvc-qpr-dev-plus-aosp