Merge cherrypicks of [19214732] into sc-platform-release. am: cea62e602a

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

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