[automerger skipped] Merge "DO NOT MERGE ANYWHERE Revert "Add the Finder...

[automerger skipped] Merge "DO NOT MERGE ANYWHERE Revert "Add the Finder shutdown message to AOSP"" into 24D1-dev am: f5d7df51 -s ours

am skip reason: contains skip directive

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



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