Merge "Move tests for com.android.internal.util out of coretests" into mm-wireless-dev