[automerger skipped] Fix NPE in updateAddPreference am: f5871449 -s ours am:...

[automerger skipped] Fix NPE in updateAddPreference am: f5871449 -s ours am: 0dcfdacc -s ours am: 2ee30881 -s ours am: 40e82e3a -s ours

am skip reason: Merged-In Id7edde492168b467360c6c99b326721cd883bba8 with SHA-1 2365ad89 is already in history

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



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