Merge "Bluetooth: Add constants to ScanResult" am: 369a94496c
am: b6656f07e7

Change-Id: I29f06e5c612e29ae25bde0e3e8854bf88213b65d