am 428ec926: Merge "camera2: Fix out-of-date metadata test"

* commit '428ec926a275e9396a5e967a4f57702d936d62ca':
  camera2: Fix out-of-date metadata test