Merge "Merge "freezer: increase timeout to 5 mins" into rvc-qpr-dev am: 821bc3759c" into rvc-qpr-dev-plus-aosp