[automerger skipped] Merge "statsd: mark libstats_jni as jni_libs" into...

[automerger skipped] Merge "statsd: mark libstats_jni as jni_libs" into rvc-dev-plus-aosp am: a84506eb am: d1e1bddc am: aca7ba2c -s ours

am skip reason: Change-Id Ie32e88355828c8f696cce9d128eebb6da70026f1 with SHA-1 95642bbc is in history

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

Change-Id: Iccf1382caf7575006bb2c117b211caed1158ba0a