am 06b1014c: Merge "Camera2 legacy: Do not advertise NV21 support." into lmp-mr1-dev automerge: a17ab21
automerge: 745d45e

* commit '745d45e0c02588762cc05d7bf3a6f5542830a987':
  Camera2 legacy: Do not advertise NV21 support.