[automerger skipped] Merge "Fix NPE in updateAddPreference" into udc-dev am:...

[automerger skipped] Merge "Fix NPE in updateAddPreference" into udc-dev am: 25b489e2 am: f73f0736 -s ours am: 60f4e180 -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: I730dab9c7076a3abbae467fbb30b3d9cd0298f1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>