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

Change-Id: I4e81ef36998e26f02866c31872796994dd2962c7