android: Track Omniswitch from Omni [1/2]

Change-Id: I98adb8033c52c78bb9fa6c97496f6cd79a0f52cb
Signed-off-by: MURA Stefano [STELIX PippoX3] <ssspinni@gmail.com>
Merge "android: Track Omniswitch from Omni [1/2]" into kk
Merge branch 'kk' of https://github.com/CarbonDev/android into kk