Merge "fix CTS: AccessibilityEndToEndTest failing" into mnc-dev

core/java/android/view/ViewGroup.java

@@ -2939,11 +2939,9 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
         }
     }
 
-    /** @hide */
     @Override
-    public void onInitializeAccessibilityEventInternal(AccessibilityEvent event) {
+    public CharSequence getAccessibilityClassName() {
-        super.onInitializeAccessibilityEventInternal(event);
+        return ViewGroup.class.getName();
-        event.setClassName(ViewGroup.class.getName());
     }
 
     @Override