Merge "Refactor PermissionManager.SPLIT_PERMISSIONS" into qt-qpr1-dev
am: fcb2ce1503

Change-Id: I830c2580f3d141a3641e023c189c148a0a1737d0