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: 7a002a78

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



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