[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

Change-Id: Ifdb327346f232f9aa8e04a6d96818a9359b1b6a7