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

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



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