Merge changes from topic "presubmit-am-b22a13ff4f3e489f907abff6d4526cb4" into udc-dev am: 3063a122c1

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

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