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

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



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