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

Change-Id: I02934a0a018bf759559d710f2edff1abe49df2cd