Merge "Fix scroll amount calculation in ViewRootImpl" into nyc-dev am: b1e24209f1
am: 2f2af39911

* commit '2f2af39911976974177e92099e27c10fe93beddd':
  Fix scroll amount calculation in ViewRootImpl

Change-Id: I145857ecc2a07ad1b7bb80334ff81c2d990bb199