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

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



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