Merge "Merge "Restrict app transition maximum duration" into rvc-dev am: f43e6bc4 am: a14a3d3d am: 3058d24f" into rvc-qpr-dev-plus-aosp