Merge "Remove BaseFragmentActivityApi24 and move multi-window methods" into nyc-dev
am: 52ab5de456

* commit '52ab5de456a1c4a069a84268f7bde91ac627050a':
  Remove BaseFragmentActivityApi24 and move multi-window methods

Change-Id: Ic6e364a049e4c286df54bfc31dd88da400f9a2ca