Merge "Fix invalidConfigRemoved" into tm-dev am: 21455ce67f

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/StatsD/+/18425448

Change-Id: I61d7739eb738ac7324efbcea075388b59a434ff1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>