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

Change-Id: I6bad98cff8f544118fda9f6f4503948f0732a641