Merge "Refine Bluetooth Metadata API"
am: e5cf74326d

Change-Id: I8b7e9137f67dfa27dd1556f49bdd4cc702015150