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

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



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