[automerger skipped] Merge "Pass in callsite of SurfaceControl constructor explicitly (1/3)" into rvc-dev am: 37cf2279c9 am: 3f8fc80e42 am: 1ee5da5f1a -s ours
am skip reason: Change-Id I46c339c15a07192d61c4c546e46f260684a47120 with SHA-1 d42ab1b938 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11920862
Change-Id: I59d6e1e8f1367875f63fdd383042cafc4f9dc700
This commit is contained in: