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

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

Change-Id: I840f8aacda874911a8f3eddc6b8feaef93b7e2cf