Merge changes Iaa941e12,Icbd4c9cd am: 2530f9ca am: b361a6f5 am: 4fb9896a

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



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