[automerger skipped] Merge "Fix ShadeCarrierGroup being initialized appearing...

[automerger skipped] Merge "Fix ShadeCarrierGroup being initialized appearing left-aligned" into 24D1-dev am: ec569ede -s ours

am skip reason: Merged-In I293d49cf21dd4461d5532652a136ea4d862dc7aa with SHA-1 629384e3 is already in history

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



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