Merge "Add clock-type to choose how timestamps are provided when profiling" am: beefb571

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



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