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

* commit '419f2177c8565f80489d00463aea630568251f4d':
  Fix issue #22612630: Ensure SMS/Call delivery during Doze