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

Change-Id: I5102aa407c5097bdcdf5aaf5be52ddfbd836a71f