am 63ff4a77: am 419f2177: am 6f64e737: Merge "Fix issue #22612630: Ensure SMS/Call delivery during Doze" into mnc-dev

* commit '63ff4a77f35d578f2c543cefeb0e6175365c60bb':
  Fix issue #22612630: Ensure SMS/Call delivery during Doze