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: I56f01f3348fd909c1fed6c5511ef1dd09042662a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>