Merge "Fix issue #34327404: AppOpsManager.stopWatchingMode(callback)..."