[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 skip reason: subject contains skip directive

Change-Id: I739ed66bb39b46f48976f2aec7b8944d1e3a07b4