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

Change-Id: I12174ffb104d9548cf1cba4facdf2e03f1b0a57c