Merge "Fix visibility rules for apex/statsd" am: 3af010fe57 am: aa837402de am: 804e8f0984

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

Change-Id: I9fc8ff51f21368fc33f98d9c598381c3bca1c0fc
tree: 80d6f4b029e626740d016e26775e2dcc0a0827f3
  1. apex/