Override config should trigger intervention ignoring opt-in info am: 5abb52c1

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



Change-Id: Ibc47ccc7bc49b317654cc170c110d37f30557dbc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>