Merge "[automerger skipped] Merge "[RESTRICT AUTOMERGE] Restrict app...

Merge "[automerger skipped] Merge "[RESTRICT AUTOMERGE] Restrict app transition maximum duration" into pi-dev am: 7a77f798 -s ours am: 2ad9d38a am: 13500411 -s ours" into rvc-dev am: a42c621c am: 9ab6759e am: bc2a0a3b am: ca814066 -s ours

am skip reason: subject contains skip directive

Change-Id: I72ab251f6b8db87dbcb16c80f0bebe84b671e934