Merge "Fix NPE crash during setup flow" into sc-dev am: fc6e9c8e

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I581c6f966860fec099e42311adce55731382814d