Merge "Revert FrameLayout.LayoutParams default gravity to -1" into nyc-dev
am: 8940a5b

* commit '8940a5b286295b164ccdd7fd5b1b04171e62e6d1':
  Revert FrameLayout.LayoutParams default gravity to -1

Change-Id: I24fee978d8f9277031eb3e3f41ab3f490b81e787