[automerger skipped] Merge "Allow reentry bounds to be overriden before...

[automerger skipped] Merge "Allow reentry bounds to be overriden before saving" into rvc-qpr-dev am: c4da5706 am: 3f0645ea -s ours

am skip reason: Change-Id I050403ca3a5c2dc44c04cca741ac71bdc4f12b8a with SHA-1 5679a841 is in history

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

Change-Id: I24ff4f485efbe01a3c26518116cc9f9881d9a544