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

Merge changes Iaa941e12,Icbd4c9cd am: 2530f9ca am: b361a6f5 am: 4fb9896a am: 775b4cb5 am: 04502b44

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



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