Merge "StorageNotification: Move notification / usb storage activity into StatusBarPolicy"