Merge "Don\'t crash activity manager when supplying invalid URI" into nyc-dev am: 13d534e7f2
am: 859465c105

* commit '859465c105215cc7d0e152ad2280419c4f820598':
  Don't crash activity manager when supplying invalid URI

Change-Id: I0e7a036384d4e30a6bfedcefb3eb18774a55538d