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

Change-Id: I044035e804af179f73fa3ecee9e670ace87e35e3