Merge "Prevent re-use of dismissed wallet view" into rvc-qpr-dev am: e2ea331b60

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

Change-Id: I3d43616cb3481ac5c473eeae0a8b206b05692760