[automerger skipped] Merge "[DO NOT MERGE] Un-release unbundled chooser in...

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

am skip reason: subject contains skip directive

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



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