Merge "AppOpsService: Fix de-dup for change records on OpModeWatchers." into rvc-dev am: 4379955437 am: 911403e500

Change-Id: Ia72dc12da3e988309b05214e94c90fc12b98cb36