Merge "Revert "Revert "Revert "Revert "Turn on the feature flag for And...""...

Merge "Revert "Revert "Revert "Revert "Turn on the feature flag for And..."" into sc-dev am: c74a9955

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I64fec7315b5e9df0f157fdca5c06e49d6888f6fd