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

Change-Id: I05cb12077fa375b16bf51f06f0568f251e0d0817