Merge changes from topic "cherrypicker-L18700000961261875:N88400001378560897" am: 59b018679b am: fb6fbba8b2

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

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