Merge "Merge "Move statsd TEST_MAPPINGS to statsd root" into rvc-dev am: d83682ea am: 177941f8" into rvc-d1-dev-plus-aosp