Merge changes from topic "227137943" am: 31aef21ec8

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

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