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

Merge "Add in-task activity transition metrics" into udc-dev am: 648caea2 am: c2a3ddfa am: fe8cf4d7 am: 42360fd5

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



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