[automerger skipped] Merge "Apply Hdr transition rate only when cap is...

[automerger skipped] Merge "Apply Hdr transition rate only when cap is changed" into 24D1-dev am: 58b489e8 -s ours

am skip reason: Merged-In Idb9d24f4555b757be81cca4ce80fb14a1b321da5 with SHA-1 419b9bc1 is already in history

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



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