Merge "Adds ChooserSelector" into tm-qpr-dev am: dcc64534db am: af62f5fdae

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

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