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

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

Change-Id: I87e154ae89ca7731fa34f09317fed828b7491d66
tree: 65209d2ebcb39eee48f58ee8a1b96904f31910ce
  1. apex/