Merge "Remove remaining references to 'delegate chooser'" into tm-dev am:...

Merge "Remove remaining references to 'delegate chooser'" into tm-dev am: 18ce89e9 am: b8529f33 am: 09c6f418

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



Change-Id: If19ea7a35bb1359efd321b3a076a3d6154a075f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>