Merge "[Settings] Avoid to unregister wrong observer" into udc-dev am: 0af8c603 am: 77e126db

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23162866



Change-Id: Ia012c94bca619f1d2165a89908341b2c9aed98d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>