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

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

Change-Id: Ibedd489e4c91e8aea2e17ed1b5bb853587f15c6e