Merge "Fix screenshot shelf colors in dark theme" into 24D1-dev am: 737f1b3786

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

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