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: e03a35a5 am: 3f7651b8 -s ours

am skip reason: subject contains skip directive

Change-Id: Ie31fab5bf3da518720b916507ce875c5085f9819