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