Merge "Add wakeup attribution to trace" into udc-dev am: 4dd9366c

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



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