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

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

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