Merge "Add security capabilities enums to ScanResult" am: a3c0324824 am: 6e67bb87cf
am: 7cad272109

Change-Id: I2767e6465c125dd19e07af5d20ae4c23b3c8d1b1