Merge "Remove broken contacts test app intents" into nyc-dev
am: 9c63a6b6bd

* commit '9c63a6b6bda87c4d5092fb5682b9c668d6f0a408':
  Remove broken contacts test app intents