Merge "DO NOT MERGE ANYWHERE: Camera: remove ITS from Lollipop" into lollipop-cts-dev
automerge: d7b3609

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