[automerger skipped] Merge "To add the Android.bp of ExternalStorageProvider"...
[automerger skipped] Merge "To add the Android.bp of ExternalStorageProvider" am: 6569dd8c am: 742ea8f0
am: fd3e4c9d -s ours
am skip reason: change_id I74235832f453110742de0b15cb14fac7514ecf0e with SHA1 593d07b9 is in history
Change-Id: I6554a108c5385c3c826f9ae9a340dcc1f01bc0c7