[automerger skipped] Merge "Fix NPE in updateAddPreference" into udc-dev am: 25b489e212
-s ours am: d7e397e97c
-s ours am: ab1b393412
-s ours
am skip reason: Merged-In Id7edde492168b467360c6c99b326721cd883bba8 with SHA-1 2365ad895a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23667755
Change-Id: I449ef5d9d54e452aeb251cd3b35d7053db0c9be2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: