Merge "Allow reentry bounds to be overriden before saving" into rvc-qpr-dev am: c4da57068c

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

Change-Id: I56a878222281889fb8d777886f97a544625fd678