Merge "Support StatsD Java API on Ravenwood (f/b)" into main am: 2ad448a1 am: 2dd597d3

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



Change-Id: Ifdabf58586e467eb15a3fe2f7150575ca6c8faac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>