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: f320d1af" into rvc-d1-dev-plus-aosp am: d51c41d0

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

Change-Id: I47088ea58c6302028c2cf4a66c31dc132ee8833f