Merge "StorageManager: API_CHANGE: Move StorageManager into  android.storage"