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

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

Change-Id: Iedd7b9212a0bcede58ba7e62013d9fea8dab99de