Merge "Merge "Skeleton implementation of Bluetooth metadata APIs" am: 625a1f4461 am: 2f1cba20a5 am: 716eb586ac"