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

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