[automerger skipped] Merge "Add units to hal times and durations names" am: 0292dbbec8 am: cd23f9852b am: 26cb9cbc83 -s ours

am skip reason: skip tag Change-Id Id1f9ee4b8e41873c97690bb19a5e84572dd9ccf1 with SHA-1 300b3245ae is already in history

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

Change-Id: Ib7d88fa960700c4ec565f12c8c6821f8cc534a5b