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

Merge "Merge "Update context object if split bounds changed" into tm-d1-dev am: bceb4a9e am: 37a384c3" into tm-qpr-dev-plus-aosp am: 92c8f68e

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



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