Merge "Fix the NullPointerException" into udc-qpr-dev am: acd7bbef am: 6058a62a

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



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