Merge "To add the Android.bp of ExternalStorageProvider"
am: 6569dd8c24

Change-Id: I4cb30701103cf77a25d7d127765dc8f58ade463b