am 680fac0c: am d606be25: Merge "Don\'t crash when component enable/disable broadcasts race with uninstall" into klp-dev

* commit '680fac0c6621b6783315c9cc9a01f951f5a44c7c':
  Don't crash when component enable/disable broadcasts race with uninstall