Merge "Revert "Migrate the usage of sCompatibilityModeEnabled"" into sc-dev am: e39067a6 am: 8dc764b4

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

Change-Id: I4a7d5b4e1de40694710e01a17ef2f7a729dbce18