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

Change-Id: I62f7aa8543e379e3dfb34bb9e39c0926432ee8ee