Merge "Support two line text in AllApps/OnDeviceSearch w/ feature flag" into tm-qpr-dev am: 5ddc6ab4da

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20898210

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