Merge "Fix closing file descriptors on config updates" am: 60923cde38

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

Change-Id: If7e5ccd53c0a5ef96a52af27dce718c1cf12bd74