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

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

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