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

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

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