Merge "Fix NPE crash in UwbPreferenceController and optimize the lifecycle...

Merge "Fix NPE crash in UwbPreferenceController and optimize the lifecycle observer adding condition in page" am: b2a466d9 am: a9c6040e am: d24f4a3f am: 41fc3efd

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



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