[automerger skipped] [SF] Make sure destination clip is contained in display bounds am: c7f9e4eea2 am: 2ed7884ad1 am: 5dc75ac702 -s ours

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

Change-Id: I75ae7ccdb7f0fee84883cf82fbf36584993e793b