[automerger skipped] Merge "[RESTRICT AUTOMERGE] Restrict app transition maximum duration" into pi-dev am: 7a77f798b6 -s ours

am skip reason: subject contains skip directive

Change-Id: I24fc0b3340434dc5ad36787759d505420816aecd