Merge "[automerger skipped] [SF] Make sure destination clip is contained in display bounds am: c7f9e4eea2 am: d815ba2176 -s ours am: f9984d67e3 -s ours" into rvc-qpr-dev-plus-aosp am: 87efad0a83 -s ours

am skip reason: Change-Id Ia7b6ebd311c1b751c1966a34a9294b9b85a2aa0b with SHA-1 c7f9e4eea2 is in history

Change-Id: I0860503fa0c97d9f0f70165ef08d8ba5fd2821dd