Merge "Add clock-type to choose how timestamps are provided when profiling"...

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

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



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