Merge "Allow SurfaceFlinger to treat 170M as sRGB." into tm-dev am: 6caac612...

Merge "Allow SurfaceFlinger to treat 170M as sRGB." into tm-dev am: 6caac612 am: 81a5cc52 am: e28622d5 am: fcd24162

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



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