Merge "DO NOT MERGE ANYWHERE Revert "Add the Finder shutdown message to AOSP"" into 24D1-dev