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

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