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

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



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