Merge "Merge "Allow different tick rates for some clock designs" into tm-qpr-dev am: c6a131a1" into tm-qpr-dev-plus-aosp