Merge "Merge "Fix instances of ContentObserver#onChange in SystemUI" into rvc-dev am: bea69abe am: c8f9a8ed" into rvc-d1-dev-plus-aosp