am f60194b1: Merge "Camera2: Update sync.frameNumber tag"

* commit 'f60194b115edb4797464dd3714ed9d03f3ff21ff':
  Camera2: Update sync.frameNumber tag