Merge "Make snapshot surface relative to parent" into rvc-dev am: f813234a...

Merge "Make snapshot surface relative to parent" into rvc-dev am: f813234a am: 352fd21e am: 93abcefc

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11692385

Change-Id: I4d571a1f0e21015729cad1801c23b34803ee51a2