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

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

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