Merge "Allow SurfaceFlinger to treat 170M as sRGB." into tm-dev am: 6caac6124f am: 81a5cc52f2 am: 5da9e03fa0

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

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