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

am skip reason: subject contains skip directive

Change-Id: Ifb094858a0a540bab00617fe6564740391e89e07