Merge "Fix screenlayout calculation with overridden screenW/Hdp" into rvc-qpr-dev am: dd5f3cd7fb

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

Change-Id: Ie9889cbcf9875ad462b6224d3fc4ac49d516ee80