[automerger skipped] Merge "Add clock-type to choose how timestamps are...

[automerger skipped] Merge "Add clock-type to choose how timestamps are provided when profiling" am: beefb571 am: 6c7314dc am: 75d02513 -s ours

am skip reason: Merged-In I23a01ff91e1a5c7e8a39339d06d0bfad8a6c4c37 with SHA-1 4af4b730 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2401636



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