Merge "Remove invalid configs from memory" into rvc-dev am: 0df64158 am: 7479fc1d am: 763eb37a

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

Change-Id: Iee4b81860d022e9b7ac495ef81f041cb4fa1685b