Merge "Show wallet option in picker even if not set up." into tm-qpr-dev am:...

Merge "Show wallet option in picker even if not set up." into tm-qpr-dev am: 324ae340 am: d7f3a473

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20978759



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