am 5eaac1ce: am e31f959c: am d143d1ff: Merge "Fix issue #11044267: AppOpsManager.startWatchingMode should take a String" into klp-dev

* commit '5eaac1ce334c0a488fee44d1a9ef5f20ff7d84ea':
  Fix issue #11044267: AppOpsManager.startWatchingMode should take a String