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

Change-Id: Ifb43f6915e7c95ba276ccbbdfad9fee99ced787c