Merge "Add an API method for clearing compat overrides on release builds" am: b9680bac79

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

Change-Id: Ia31e173176fe8e3ce57f33279f3b51cea52daf42