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

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



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