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

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



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