Merge "Merge "Fixing wrong arguments used for permission check" into qt-dev am: fa54e4b62a am: 89a64a9dc9" into qt-r1-dev-plus-aosp