am 06b1014c: Merge "Camera2 legacy: Do not advertise NV21 support." into...
am 06b1014c: Merge "Camera2 legacy: Do not advertise NV21 support." into lmp-mr1-dev automerge: a17ab21d
automerge: 745d45e0
* commit '745d45e0':
Camera2 legacy: Do not advertise NV21 support.