Merge changes from topics "jank-tags-faas", "transition-finish-faas",...

Merge changes from topics "jank-tags-faas", "transition-finish-faas", "transition-type-faas" into udc-dev am: 89b54da1 am: 74d490f2

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



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