[automerger skipped] Merge "Correct the bound if it's from outside of screen...

[automerger skipped] Merge "Correct the bound if it's from outside of screen am: a67e14a6 am: 86e825ac am: 8e39335c" into rvc-qpr-dev-plus-aosp am: b6de6c49 -s ours
am skip reason: Change-Id Ie2107f58a7cc5f0b76e4a468cfb295c410dbb559 with SHA-1 a67e14a6 is in history

Change-Id: Ifaf6eecee58fcfcf952376266b7b5d959afa8cca