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

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



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