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

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

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