Merge "AppOpsService: Watch op mode changes when an AppOp restriction dies"