[Settings] 1.Clean up unnecessary callback 2. register listener and am: 5645c092 am: 0b0000a9

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



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