UltraHDR: update Version handling. am: 05ceebfbae am: 711c5b1a1b

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

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