Merge "Merge "AppOpsService: Fix de-dup for change records on OpModeWatchers." into rvc-dev am: 43799554 am: 911403e5" into rvc-d1-dev-plus-aosp