UltraHDR: update Version handling. am: 05ceebfbae am: 2b6e2abb39

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

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