Merge "Make changes guarding the new opt-out scheme overridable" into sc-dev...

Merge "Make changes guarding the new opt-out scheme overridable" into sc-dev am: bdd1f279 am: 26aa9028

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

Change-Id: I1222aa774abcc95c465a0859e4dd7a913f885c39