Merge "Merge "Bluetooth: Add constants to ScanResult" am: 369a94496c" into stage-aosp-master