Merge "Fix NPE in updateAddPreference" into udc-d1-dev am: 8ba960014c
am: 71a57d8cec
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23672674 Change-Id: I4e198e342f989d040ed194dab44b6835e2ab364b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: