s4-common: Correctly log HTC unsols

Change-Id: I697d270fbc2ca971ee33c7b80f3ad9478a7cf2a2
Merge remote-tracking branch 'cm/cm-12.0' into HEAD