tree 57f1f8ce12e2f73574dbce213d563d412342a383
parent 3798d52cd6435e270f1bfaf946620e4940088305
parent a42c621ce882db5efbe7421bd8b6bc7ad3610818
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1588714986 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1588714986 +0000

Merge "[automerger skipped] Merge "[RESTRICT AUTOMERGE] Restrict app transition maximum duration" into pi-dev am: 7a77f798b6 -s ours am: 2ad9d38a63 am: 135004114a -s ours" into rvc-dev am: a42c621ce8

Change-Id: I3f6b6b0be6ff6ebde0d8a4784935a9b8d78b3620