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

Change-Id: I15b32d2a0514945d6e05164dd213af3db01f959e