Merge changes Iaa941e12,Icbd4c9cd am: 2530f9ca5e am: b361a6f5f4

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

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