Merge changes I7fa1087b,Idf3a0a8b into nyc-mr1-dev

* changes:
  QCamera2: avoid leaking device code names to JPEG EXIF
  QCamera2/HAL3: Use snapshot format for 4K live snapshot as well