[automerger skipped] Merge "Update screenshot shelf UI flag name" into...

[automerger skipped] Merge "Update screenshot shelf UI flag name" into 24D1-dev am: 8ea2570f -s ours

am skip reason: Merged-In I8250035bf8d33b977088a7aa748d780de306a7e0 with SHA-1 98c656af is already in history

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



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