Merge "Update scroll chip on rotation" into 24D1-dev am: e577313649

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

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