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

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



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