Merge "Support two line text in AllApps/OnDeviceSearch w/ feature flag" into...

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

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



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