Merge changes from topic "duration-unit" into udc-dev am: 88cabb91

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



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