Merge "Fix FragmentOptimizationTest#focusedView on API17." into nyc-support-25.2-dev
am: 826d6b277b

Change-Id: I62df16fd432af8212d7669ec64afcabae7cbee8f