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

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

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