am 9d925d2d: am da910fd5: Merge "Handle ActivityNotFoundException in the WM policy." into honeycomb

* commit '9d925d2dfdb2a0bd89ff081c1693129f3bf85e77':
  Handle ActivityNotFoundException in the WM policy.