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

Merge "Revert "Revert "Turn on the feature flag for Android S Settings.""" into sc-dev am: debc58e0

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13479025

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib3b47284cb63cd015e482f68a0c7b139a1d4e86a