[automerger skipped] Fix NPE in updateAddPreference am: f58714496a
-s ours am: 0dcfdacc25
-s ours am: 2ee3088167
-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: Ie148ac91f62cf55ff53e1c3df8b6b334997e2c60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: