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

Change-Id: I77b6b8e6d469a9e28478ddd7975f9c065caef20b