am 3d879345: (-s ours) Merge "DO NOT MERGE ANYWHERE: Camera: remove ITS from Lollipop" into lollipop-cts-dev automerge: d7b3609

* commit '3d87934560b95560b9dc07e2e5c1f49c00369597':
  DO NOT MERGE ANYWHERE: Camera: remove ITS from Lollipop