Merge "Fix finishTransaction position when Shelf height is changed" into tm-dev am: f3655741 am: 0d70f438

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16996708

Change-Id: I0c8b3dca3a829c6d641a2eb345d99b7104f95570