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: ecfd3599

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



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