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

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