Merge "To add the Android.bp of ExternalStorageProvider"