Merge "StorageNotification.java: Apply FLAG_IMMUTABLE to various PIs"