Merge "Merge "Add permitted_packages to framework-permission." into rvc-dev am: 813f173b88 am: a500745443" into rvc-d1-dev-plus-aosp am: bf10fefebd

Change-Id: I946ff5e82ed9f34976356bc876c1ccd6bde8cc8b