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

Merge "Merge "Make snapshot surface relative to parent" into rvc-dev am: f813234a am: 352fd21e am: 76746b02" into rvc-qpr-dev-plus-aosp am: 9dee520b

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

Change-Id: I2238af3a3d8bfa6bb797cc1ea73e6c4be1e3eb3d