Merge changes I9e06f025,I413c3803 am: 7b27d7bcc6

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

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