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

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