Merge "Merge "Remove unnecessary +1ms to quota window calculation." into rvc-dev am: cbe9c278 am: 63a9cea3 am: 5dfb8438" into rvc-qpr-dev-plus-aosp