am 958c8013: Merge "Camera: fix wrong String.format argument" into lollipop-cts-dev

* commit '958c80135f9b6360aadfe5276e1a524ac4e5644f':
  Camera: fix wrong String.format argument