Merge changes I82c9811c,Id0294300

* changes:
  Camera2: Add basic concurrency guards.
  Camera2: Add internal parameter state to dump.