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

Change-Id: I467bd202872c05f6c5649e81661876c8acd942c7