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

* commit '9fdf4e1b576ab5ace89ed817467879afbdadc322':
  Fix NPE in AppOpsService