[automerger skipped] DO NOT MERGE Don't throw exception in AppOpsManager.checkOp am: 892ded1e8a am: 0b23099611 -s ours
am skip reason: subject contains skip directive

Change-Id: Iec1d50d146e5775264a447159b7fec6746258355