Merge "Don't override bounds when reparenting" into rvc-dev am: 1fffbc69fb am: 2215b1dfa3

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

Change-Id: Ida3d58fc1d586c4aa90fb1532a2ecc31af171953