[automerger skipped] Merge "Refactor PermissionManager.SPLIT_PERMISSIONS" into qt-qpr1-dev am: fcb2ce1503
am:d4d88f2486-s ours am skip reason: change_id I111403e8dae3bc2b0acafc32e61aa5cd890fea29 with SHA1de787d4a83is in history Change-Id: I8c22ac0adb48d194e9ddde99bf9518f554ab9af2
This commit is contained in: