Merge "CameraITS: Skip param_tonemap_mode if contrast_curve mode is not supported" into pie-cts-dev am: f974eed18d am: ee6a7bb9df

Original change: https://android-review.googlesource.com/c/platform/cts/+/1490248

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I42b7151015618276c6c2909d0e3cc7ed991f42cf