Merge "Make changes guarding the new opt-out scheme overridable" into sc-dev am: bdd1f279c5 am: 69bfe6e18e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14353381 Change-Id: I90acfb93653ef60ba1e48c9e3b4969890e2f5dbc
This commit is contained in: