Merge "Use Window Context for SurfaceControlViewHost." into tm-dev am: c85e97a7a1 am: b89785bb2f am: 9b1000bd15
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17619324 Change-Id: I73b6e2b1bd2c4c718abeebfbcce2e5f4fd156ee6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: