Merge changes from topics "presubmit-am-5b7a95f212ff478f89a6c087d9e90e0c",...

Merge changes from topics "presubmit-am-5b7a95f212ff478f89a6c087d9e90e0c", "presubmit-am-cc636b1b7be5428c86072a21533d351e" into tm-dev am: 73592317

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



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