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: 9d70ac02 am: c77a4261 am: a39350bc -s ours

am skip reason: subject contains skip directive

Change-Id: Icc04a348f153fa3d37775645f460f2d721557642