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

Change-Id: I0a5d8004a9047cd36fd59b4874061a7c2ee97dc7