Merge "Fix colorSpace lose during screen rotation." into tm-dev am: 0be3f090 am: 71420321

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



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