Merge "ViewRootImpl: Update opaque flag if SurfaceControl changes from relayout" into sc-dev am: ad85547f8b am: ddb1e2f987

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

Change-Id: I2281f0031a0e18ba871ef4107ac24a679d7a538b