Merge "Merge "Forward dumps from PermissionControllerManager to permissionmgr" into rvc-dev am: f7d1f1a40c am: 841af79daa" into rvc-d1-dev-plus-aosp