Merge "Rename Sdr/Hdr to Hdr/Sdr internally to get avoid of confusion." into...

Merge "Rename Sdr/Hdr to Hdr/Sdr internally to get avoid of confusion." into udc-dev am: d6e0bae8 am: b22eaaa6

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



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