Merge "Metrics: Add Bluetooth address obfuscator in Java" am: 6fa1bcd272
am: fdb58cc5b4

Change-Id: Ica373465ddce36fc812d75db35314b4d038f03fb