Merge "Do not check AppOp if not required" into qt-dev am: 2494c954b6
am: cc5f757206

Change-Id: I749de6165ea5974d56ba6d1a36f5af52a860d388