Merge "Clear video pause tracker when video un-pause reported by the modem. am: 077dd3fef0 am: 586264f9af" into oc-dr1-dev-plus-aosp