[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 am: 3798d52cd6

Change-Id: I7b25dfdc6f586de5127bf77399890eff6ee33fe2