Merge "Skip unknown change IDs when adding/removing overrides on release builds" into sc-v2-dev am: 7ff3fe9ca5

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

Change-Id: I07a565cec471f8f72a0910a89767575421c84aba