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

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

Change-Id: I04c649462a8b656bdbef394198b0f4ca302f5da9