Merge "Tilt scale correction for certain resolutions" am: 9365dde616 am: f6814fa098

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1753368

Change-Id: I0f3f0e4562c5d0b4d135cbfb9d37c9c1413f63a4