Revert^2 "Support search "Mobile data""

This reverts commit 979de759522356a015cec704f68713208e96e06c.

Reason for revert: Failed CarDeveloperOptions tests fixed.

Change-Id: Ic0bdf47ab3cb40dbadebb738c0c5842e4e1bf9c8
8 files changed