Merge "[RESTRICT AUTOMERGE] Restrict app transition maximum duration" into oc-dev am: 6255311d39

Change-Id: I88c9f8957623fe784010ea7cadc9566fa4496377