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

Change-Id: I7ce548e86a4bf23b0155ee30cd638483edd8f1d4