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

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

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