Merge "Do not call noteOp if checkPermission fails"
am: bc9b1b6f94

Change-Id: I53347c7a897b079268d9c8af704664a832eae581