[automerger skipped] Merge "Change NNAPI time from steady_clock to boot_clock -- hal" am: d1626e1a4a am: 324752c753 am: e1eb6b553d -s ours am: fedc0dd565 -s ours

am skip reason: skip tag Change-Id I5a7d039a31d9ce98602a301387ec99635f279f42 with SHA-1 4895b4df79 is already in history

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

Change-Id: Ieb851ccd6c9db4c5fdf53a356ec9f58a18afd704