Merge "[DO NOT MERGE] Un-release unbundled chooser in QPR" into tm-qpr-dev am: a5a63dfe

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



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