Merge "Remove test_com.android.os.statsd from apex_available" into main