[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: 7807ea3c am: 16967910 -s ours

am skip reason: subject contains skip directive

Change-Id: Ia608a0b8d5d9914cff5cbdb8a2ba85d62dc51333