You are completely right, that’s the more relevant part of code. I was referring to the code in the settings app that lets you toggle it (which didn’t get me very far with my own experiments).
Interestingly enough, the commit you linked is dated July 16th, but we have reports of a working wide-angle lens on LeOS from June, so as always with Camera2, it’s complicated 
That’s probably the best interim solution, but you seem to make great progress here, keep up the good work 