Merge "Remove invalid configs from memory" into rvc-dev am: 0df64158 am: ca782b88 am: c78787f0

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

Change-Id: I0c132065e7f7ca60ac8a4dfd58122a9b5512f590