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

* commit '56a75de4cca182920a0ceab5a3f28990c8754b06':
  Exception in TestAccessHistory tearDown