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

* commit 'dfb50d5857bf9b0863514b405859f39308bce609':
  Fix NPE in AppOpsService