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

Change-Id: I8876af2e00e6a52629a47c1ef7c26f4c674e5de8