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

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

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

services/core/java/com/android/server/wm/TransitionTracer.java

@@ -91,6 +91,13 @@ public class TransitionTracer {
      * @param transition The transition that has finished.
      */
     public void logFinishedTransition(Transition transition) {
+        if (transition.mLogger.mProtoToken == 0) {
+            // Transition finished but never sent, so open token never added
+            final ProtoOutputStream outputStream = transition.mLogger.mProtoOutputStream;
+            transition.mLogger.mProtoToken = outputStream
+                    .start(com.android.server.wm.shell.TransitionTraceProto.FINISHED_TRANSITIONS);
+        }
+
         // Dump the rest of the transition's info that wasn't dumped during logSentTransition
         dumpFinishedTransitionToProto(transition.mLogger.mProtoOutputStream, transition);
         transition.mLogger.mProtoOutputStream.end(transition.mLogger.mProtoToken);