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

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

Change-Id: I87e154ae89ca7731fa34f09317fed828b7491d66