Merge "Add trace points to service related events" into udc-dev am: 41d88dd5 am: 80ed8564

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



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