Merge "Fix XML preference controller with androidx LifecycleObserver" into tm-dev am: 90e007ded1
am: 23b2e43940
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17465484 Change-Id: I71e06699007801a02afce0680c10a72814e2229e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: