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

Change-Id: I184f1a40a9dc854071915609dc13322d0fc86a97