[2/2] omni: added OmniSwitch

Change-Id: I472125920463920534cdd8f613272d4d564b5a2b
Merge branch 'android-4.4' into teamub