Merge "Move tests for com.android.internal.util out of coretests" into...
Merge "Move tests for com.android.internal.util out of coretests" into mm-wireless-dev am: 5947d111
am: acaf8091
* commit 'acaf8091':
Move tests for com.android.internal.util out of coretests