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 am: 7548ef5c" into rvc-qpr-dev-plus-aosp am: c5d1f2a4

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

Change-Id: I70817f137853d1de1472783373e6b14c711f6e9f