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

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



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