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

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



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