Merge "Fix visibility rules for apex/statsd" am: 3af010fe57 am: 029c7e2a02 am: 2887a09496

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

Change-Id: I9fc8ff51f21368fc33f98d9c598381c3bca1c0fc