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

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

Change-Id: I1395f7f9dc333f8604700ea45b723bd86187b99d