[automerger skipped] Merge changes from topic "227137943" am: 31aef21ec8 am: 7ae76339be -s ours am: fd210c40d9 -s ours

am skip reason: Merged-In I49881d136697cd5f207a61e179779b532d0d8e76 with SHA-1 aef9dec7dd is already in history

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

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