Merge "Merge "Resolver/Chooser - Fix reuse of textview" into rvc-dev am:...

Merge "Merge "Resolver/Chooser - Fix reuse of textview" into rvc-dev am: ab3811ef am: 413da06b" into rvc-d1-dev-plus-aosp am: e0411aec am: bd4472c4

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

Change-Id: If0aa665c98137546b54e8a5a021d7cf6ab84c256