Merge "Allow Statsd Tests to run on R devices" am: 882bb1fd39 am: e0425cd649 am: deed4561d8

Original change: https://android-review.googlesource.com/c/platform/packages/modules/StatsD/+/1677865

Change-Id: I0b738cba7ed0238e251ce9e33ad348079b614adc