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: I4bc611b2bd0d569fa051158fbe774481351742e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>