am cbd49ac4: Merge "Avoid suspending for alloc trace enabling when already suspended."

* commit 'cbd49ac468a70808a5c66ed4f04c80bc486dafce':
  Avoid suspending for alloc trace enabling when already suspended.