Merge "FrameworksWifiNonUpdatableApiTest: make APK package name unique"