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

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



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