Merge "Update context object if split bounds changed" into tm-d1-dev am:...

Merge "Update context object if split bounds changed" into tm-d1-dev am: bceb4a9e am: 7a499f6c am: dca92030

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



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