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