Merge "Merge "Adding null check for split bounds before notifying" into...

Merge "Merge "Adding null check for split bounds before notifying" into rvc-dev am: 736647f2 am: c8c43b25" into rvc-d1-dev-plus-aosp am: ad807e8f

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

Change-Id: Ib31198e6ecef5c6cb6deb8f92e3eac0e2a3dfb3f