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

Change-Id: Ia9690a8837a8c6aa0e538df7b89968369695a9c1