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

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



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