Merge "Set most leniant mode if two perms affect one appop" into qt-dev am: d84102bf am: 1554254b am: 49a0a28f Change-Id: Ibe30da6b1b99e7ddd7071215b33dccaf9e3262e7