Merge "Add the Finder shutdown message to AOSP" into main