am d3bfe6e9: Merge "Exception in TestAccessHistory tearDown" into lollipop-cts-dev

* commit 'd3bfe6e91d70b7a66d0cd594d15250330c3af377':
  Exception in TestAccessHistory tearDown