[automerger skipped] Merge "[RESTRICT AUTOMERGE] Restrict app transition...

[automerger skipped] Merge "[RESTRICT AUTOMERGE] Restrict app transition maximum duration" into oc-dev am: 6255311d am: e18fd339 am: b1ae5fd4 -s ours am: 2adaef29 -s ours am: e5f0ec9b am: 306b8b41 -s ours am: 6b1b2f4e am: 0a6632ef am: 675100c4

Change-Id: I1eb847a13303f43167341946690af956c5f5581d