[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: 253bd94b am: 4ae55cae am: 1c100c3d -s ours

am skip reason: subject contains skip directive

Change-Id: I087990448a4041124fd78e37b58a4b3ca50bca8a