Merge "CHOOSER_UNBUNDLED -> droidfood" into tm-qpr-dev am: 91f53181f5 am: 48cff418e7

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

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