[automerger skipped] Merge "Add units to hal times and durations names" am:...

[automerger skipped] Merge "Add units to hal times and durations names" am: 0292dbbe am: cd23f985 am: 26cb9cbc -s ours am: 7e87dbea -s ours

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

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

Change-Id: Ib0a5037ebcff8848618ddec39e2b7f2208f6a3ff