Merge "Preemptively reset split reparenting flag when entering split" into...

Merge "Preemptively reset split reparenting flag when entering split" into udc-qpr-dev am: e77f5fa0 am: 558d5bd0

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



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