Merge "Adds flag to show 2 rows of predicted apps in All Apps 0 state." into...

Merge "Adds flag to show 2 rows of predicted apps in All Apps 0 state." into tm-qpr-dev am: c9c45ed7 am: c0eb61e8

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



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