am a41d414: AI 147545: CTS: Handle timeout issues in unexpected tests

Merge commit 'a41d41458defd0cb87fd167b88b9d1cecf4f51dc' into donut

* commit 'a41d41458defd0cb87fd167b88b9d1cecf4f51dc':
  AI 147545: CTS: Handle timeout issues in unexpected tests
tree: bc87d9420be4d9e27a081a59c9063b80ac345d32
  1. tests/
  2. tools/
  3. Android.mk