Merge "Scale screenWidth for split proportionally for thumbnail matrix" into...

Merge "Scale screenWidth for split proportionally for thumbnail matrix" into tm-qpr-dev am: e3d56e69 am: 5d9785d4

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



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