[automerger skipped] Merge "Pass in callsite of SurfaceControl constructor...

[automerger skipped] Merge "Pass in callsite of SurfaceControl constructor explicitly (1/3)" into rvc-dev am: 37cf2279 am: 41bd44e6 -s ours

am skip reason: Change-Id I46c339c15a07192d61c4c546e46f260684a47120 with SHA-1 d42ab1b9 is in history

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

Change-Id: Iebc41514aae21010234124a9d905c52fa9a03cf8