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

Change-Id: Id965c774d70ad823de8f32d0e63b6d0ce0471754