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

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



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