am 16c14061: am 6d3c04d0: am 4da4c854: am 4a6eeca5: am c0d0c15d: Merge "Exception in TestAccessHistory tearDown" into lollipop-cts-dev automerge: d3bfe6e

* commit '16c140617f98d1474e43eaddb5fa6a2112d22a00':
  Exception in TestAccessHistory tearDown