Merge "cts testFindNextFocusFromRect fix" into pie-cts-dev
am: ed2290c32a

Change-Id: I75c901ea72098779dc7ce963752a369f243ce38d