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