This reverts commit a090fe06. Bug: 141383888 Test: Manual, m -j RunCarSettingsRoboTests Change-Id: I4339d59b77ddad57fed77934cfc1b2d63de59d39