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

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