am 4a6eeca5: am c0d0c15d: Merge "Exception in TestAccessHistory tearDown" into lollipop-cts-dev automerge: d3bfe6e

* commit '4a6eeca54be26b67fd686add73683831c16d2d6d':
  Exception in TestAccessHistory tearDown