am 950aa197: Merge "Revert "Clarify handling client certificates"" into mnc-dev
am 950aa197: Merge "Revert "Clarify handling client certificates"" into mnc-dev

* commit '950aa197d417bf18ddbdd7fb6fe11f990860b639':
  Revert "Clarify handling client certificates"

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base