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

Change-Id: I53023c0d749473f59aa8f80a83daab30630318a6