am 688efe5d: am 87920455: Merge "Fix NPE in AppOpsService" into mnc-dev

* commit '688efe5da94ec632af548c5f5bc4b46fad23165c':
  Fix NPE in AppOpsService