am f80a32e6: am e92d9bd1: am aefcae4d: Merge "camera2 CTS: Wait for session close callbacks before teardown." into lollipop-mr1-cts-dev

* commit 'f80a32e60589157b1db0f11e4ed381fe29f9fa23':
  camera2 CTS: Wait for session close callbacks before teardown.