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

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I884eb74478af45e8fd8d54691faa389a0127d99a