Merge "Fix ANR in multidexlegacytestservices."