[automerger skipped] Merge "Fix screenlayout calculation with overridden...

[automerger skipped] Merge "Fix screenlayout calculation with overridden screenW/Hdp" into rvc-qpr-dev am: dd5f3cd7 am: 846a6523 -s ours

am skip reason: Change-Id I0fcec4f035e466fafedc31be5925c0b04a6580f7 with SHA-1 ea5f4856 is in history

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

Change-Id: I7569f51b11fe33f0249646d64d40619915df2a53