Merge "Don't attempt to tone map content that is already in range." into sc-dev am: 263d778ae3

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

Change-Id: I15cc29bd8381e6a55604ce78d1e76706def9ddf3