Merge "Support halt the trace when schd-dbg hit deadline"
am: f232542c03

Change-Id: I45b92a5340d8bbc6aa0898b0a1ef073223e49cf6