Merge "Support metadata APIs for Bluetooth storage" am: b5b2a0da25
am: 91370d2778

Change-Id: I0d4a3b52a1a15235fb88172ece679727f4228c45