[automerger skipped] Follow-up commit of aosp/2329897 am: 5babeec8 -s ours am: 47b1a9ec -s ours

am skip reason: Merged-In Ied83dac5c33e06f6ad4ced18fbee785047b24c38 with SHA-1 562cbfee is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/21365939



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