Revert "Revert "Turn on the feature flag for Android S Settings.""

This reverts commit 5ad13e0c258a30040cae8a9ea38c7de06070eb97.

Reason for revert: Test case has been fixed

Change-Id: Id05757c494628c1d84943b383cf7639098a3fa3a
1 file changed