Merge "Make sure updateSurface is called for rotation change" into tm-qpr-dev am: 0428d864

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



Change-Id: Ie64e10e3de3a5e8c84f3825a1f6ea01f528e94c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>