Merge "Merge "Fixing wrong arguments used for permission check" into qt-dev am: fa54e4b62a am: 4774c337d9" into qt-r1-dev-plus-aosp
am: 46687bc648

Change-Id: Ib9091ca5fbacce4040a09df837bc0518430b1539