Merge "Enable SHORTCUT_LIST_SEARCH_LAYOUT For Teamfood" into udc-dev am: 40666ffa

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



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