[automerger skipped] Merge "[RESTRICT AUTOMERGE] Restrict app transition maximum duration" into oc-dev am: 6255311d39 am: e18fd339be am: b1ae5fd443 -s ours am: 2adaef294b -s ours am: e5f0ec9b2a am: 306b8b4192 -s ours am: 6b1b2f4e51 am: 0a6632effd am: 675100c402

Change-Id: I1eb847a13303f43167341946690af956c5f5581d