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: 732f43e5 am: 69a683ff" into rvc-qpr-dev-plus-aosp am: a7c94cd5

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

Change-Id: I8a6d5e29afb9eb8d265b233bca990fc10c00c5a4