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: e9b912ff" into rvc-d1-dev-plus-aosp am: 002eb79d am: 255ab0f0

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

Change-Id: Iebceb497dadfdc9806d8a64315a50213ef2376ca