Merge "hotspot2: expose string constants for cert type and auth methods" am: 603fb2ef56
am: d919593b9d

Change-Id: I04651e913216903316e8625672cf62609e76058d