Revert some of the recent commits

Revert "OCD: Kicked in"

This reverts commit 3583bc624556bfe1fd4f59c106450e69fe804c2e.

Revert "Fix cherry-picks"

This reverts commit bf6d12abfb149ac3b44e24c18032384972c03116.

Revert "UMS: Add the missing notification when USB connected"

This reverts commit cbb8205dbffc43a98df335d232ce4141e84c87ca.

Change-Id: I45859c0c49d414a0a0d98e95e929de928dae67c9

Revert "UsbSettings: Add UMS mode support"

This reverts commit 7d9885cd7df1bb21b87268d344a04f89fee63cc4.

Change-Id: I8f5cc8a7698111657e1c07e9ffc2ef79a0e13471
Signed-off-by: Lokesh Chamane <lokesh.c703@gmail.com>