Merge "Include real to elapsed time offset in transition trace" into udc-dev...

Merge "Include real to elapsed time offset in transition trace" into udc-dev am: 66fb7c7f am: 1aab8b73

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



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