Merge "Fix NPE in updateAddPreference" into udc-d1-dev am: 8ba96001 am: f0614ef7 am: 2d5f43d7

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



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