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

Change-Id: I10e09a0bc15d9f4782ac9d91878becb9046581c3