Merge "Set most leniant mode if two perms affect one appop" into qt-dev am: d84102bf9e
am: 1554254bed

Change-Id: I90dbaa4a06ec88fdfe7355d4bed53d03a5d25127