Merge "camera2: Treat face detect mode larger than FULL as FULL" into pi-dev am: 2fca393cc1
am: d05d630060

Change-Id: I3947264d88d0c558f8c7fb5ee22160af934e411e