Merge "Fix sidefps on portrait large screens" into tm-qpr-dev am: 25ab2105 am: d61565a3

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



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