Merge "Fix colorSpace lose during screen rotation." into tm-dev am: 0be3f090 am: 4defc7f6 am: d1f20c56 am: ac3b253a

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



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