[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: f559e85964

Change-Id: I88c04b0286a15bc6c7a30957459f44d785fe9acb