Merge "Merge "Remove unnecessary +1ms to quota window calculation." into...

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

Change-Id: I251ccb000714490c0d03f164330f691278d76e44