Merge "Adjust the number of recommendations according to display size" into...

Merge "Adjust the number of recommendations according to display size" into udc-dev am: 1620670c am: 90d37e5c

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



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