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

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



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