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

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

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



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