Merge "Change user setup prompt dialog showing logic" into rvc-dev am: f8754b4deb am: 974efbd7f2

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

Change-Id: Idf895f299526d9eacdd139d8dbe77e98c22d1e1d