[automerger skipped] Merge changes from topic "227137943" am: 31aef21e am: 7ae76339 -s ours

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

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



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