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

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



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