am 21c09e8a: am f0f45452: Merge "Reset deferred task removal when app token added." into klp-modular-dev

* commit '21c09e8a58982531f69dcbce760be42528bc9f9d':
  Reset deferred task removal when app token added.