Merge "Avoid caller NPE if callback null in AppOpsService"