[automerger skipped] Merge "[RESTRICT AUTOMERGE] Restrict app transition maximum duration" into oc-dev am: 6255311d39 am: e18fd339be am: b1ae5fd443 -s ours

am skip reason: subject contains skip directive

Change-Id: Ifcfb341328552ff00f058df8ae3eb5734f87b4af