Merge "Fix bug 5339708 - edge case in ListView focus restoration"

Author: adamp

core/java/android/widget/ListView.java

@@ -1651,6 +1651,7 @@ protected void layoutChildren() {
                 // are focusable
                 if (mItemsCanFocus && hasFocus() && !sel.hasFocus()) {
                     final boolean focusWasTaken = (sel == focusLayoutRestoreDirectChild &&
+                            focusLayoutRestoreView != null &&
                             focusLayoutRestoreView.requestFocus()) || sel.requestFocus();
                     if (!focusWasTaken) {
                         // selected item didn't take focus, fine, but still want