Merge "Handle edge-case where the focus-search root is focused" into oc-dev

am: fe9ce65491

Change-Id: I8232e1313e9e9babb152fcd03f1e6e224a979e52

core/java/android/view/FocusFinder.java

@@ -118,7 +118,7 @@ public class FocusFinder {
      * @return the "effective" root of {@param focused}
      */
     private ViewGroup getEffectiveRoot(ViewGroup root, View focused) {
-        if (focused == null) {
+        if (focused == null || focused == root) {
             return root;
         }
         ViewParent effective = focused.getParent();