Merge "[automerger skipped] Merge "Cherry pick constants to LatencyTracker" into tm-qpr-dev am: c2936af3 am: 144868fe -s ours" into udc-dev