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

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

Change-Id: Ib98ea2a04725543cf4c553d4f1164eb2bd50e527