Merge "Update wallet setting availability" into tm-qpr-dev am: 61f81ffb am: 02cace2f

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



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