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

* commit '5947d11119d2ca1426d358a6850bd5a8d8490ab5':
  Move tests for com.android.internal.util out of coretests