Merge "Migrate frameworks/base/services/core/java/com/android/server/am  to androidx.test"