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

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



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