[automerger skipped] Fix visibility rules for apex/statsd am: 3001a82d2c -s ours

am skip reason: Change-Id I6932b145708398581fce8c284449887a5efccacc with SHA-1 9e6d410771 is in history

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

Change-Id: I279536e3812588dc2ef4503d4969be30ab727110