Fix the NullPointException am: 5a4df243f0 am: 5221cb21bd

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

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