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