Merge "Maintain relative order of changes during CHANGE transits" into 24D1-dev am: b9b3791871

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

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