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

Merge "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" into rvc-qpr-dev-plus-aosp am: 7296f591

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

Change-Id: I17be2a380ecfcb467fd4276c32cf7f3d9101bdb5