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

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

Change-Id: Ic1b9bb5b3f6cfba5192838020fc1b9770715f80a