am 00fb27dd: Merge "Camera2: add metadata override" into klp-dev

* commit '00fb27dda8c74229ea55b524063410842ba4a21e':
  Camera2: add metadata override