Merge "Add in-task activity transition metrics" into udc-dev am: 648caea2 am: 24c9809f

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



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