Squashed: bring in the latest merged Omni changes

Camera: Add SEMC resolutions

Change-Id: Ib033d12a094fd7b6802517e58e9c4ba1dfd1b95b

Camera: Unbreak resolutions

* Remove duplicate resolutions
* Fix AOSP mismerges
* Move hardcoded resolution names to strings
* Unbreak order of low resolutions

Change-Id: I1c5bfb78691c14792e8e09bcdfdcdd62f23f7eab