Merge "Fix visibility rules for apex/statsd" am: 0a9aff2315 am: da7bb0e81e

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1516918

Change-Id: I5419ade18e92c50bdadcf3bd2a38d88dfbc281c2