Merge "Enable SHORTCUT_LIST_SEARCH_LAYOUT For Droidfood”." into udc-dev am: 0680373004

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

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