am ccc366a9: am 1191454a: Merge "Camera3: Skipping no-ops good, not updating state machine bad." into jb-mr2-dev

* commit 'ccc366a90fdd8d9df5de27820f04bc534d122c07':
  Camera3: Skipping no-ops good, not updating state machine bad.