[automerger] DO NOT MERGE Fix unexpected behavior in smp_sm_event am: 42efb44561 am: becc7df8ac am: e9220d374d

Change-Id: Id9f1cb41fde0ced026415ecf20766edd5df593ca
tree: 954c8e85acc5e5b9b719739548d3264de31be5d9
  1. gki/
  2. system/
  3. Android.mk
  4. CleanSpec.mk
  5. MODULE_LICENSE_APACHE2
  6. NOTICE