Merge "Limit resizing to within the stable bounds" into tm-qpr-dev am: 0d5a7f4b am: 8851ee75

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



Change-Id: Id51131ff27e31598d1dff3c66e6a001b8e04e659
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>