[automerger skipped] Merge "Refine Bluetooth Metadata API" am: e5cf74326d
am: 4359aa933f -s ours
am skip reason: change_id I79460071c7693f648e92cf849738c24f8bc269d9 with SHA1 4741a8bd53 is in history

Change-Id: Ibc44e25bbc5a2c0d920f64bb39ac36b4455d2377