Merge "OppService: Make sure ContentObserver is not called after stop" into main

        @Override

        public void onChange(boolean selfChange) {

            Log.v(TAG, "ContentObserver received notification");

            // Since ContentObserver is created with Handler, onChange() can be called

            // even after the observer is unregistered.

            if (Flags.oppIgnoreContentObserverAfterServiceStop() && mObserver != this) {

                Log.d(TAG, "onChange() called after stop() is called.");

                return;

            }

            updateFromProvider();

        }

    }