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

Change-Id: I3b7c6c45ad7b209b9a96008b593a13d59cf36783