Merge "Focuses on folder container for Accessibility when no contents to focus on." into ub-launcher3-rvc-qpr-dev am: 4c7ced91c0

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/12146163

Change-Id: I7f2e6121a735b2c356958a74cdd9d2daa625f174

src/com/android/launcher3/folder/Folder.java

@@ -741,7 +741,8 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
 
     @Override
     protected View getAccessibilityInitialFocusView() {
-        return mContent.getFirstItem();
+        View firstItem = mContent.getFirstItem();
+        return firstItem != null ? firstItem : super.getAccessibilityInitialFocusView();
     }
 
     private void closeComplete(boolean wasAnimated) {