am 319e4728: (-s ours) Merge "[DO NOT MERGE]Fix ION memory leak for camera2 testStillPreviewCombination" into lollipop-cts-dev automerge: c0edc3c

* commit '319e4728609f3885a17e0ab579c6a678157a0e8c':
  [DO NOT MERGE]Fix ION memory leak for camera2 testStillPreviewCombination