Merge "Expose PermissionManager as TestApi and fix SplitPermissionInfo equality" into qt-dev am: d703395fcb
am: 7347c0f704

Change-Id: If3f0a0e539ced53c291b67b2a750004583f26840