Merge "Remove Trace.Pause/Resume."
am: 9895094fd8

Change-Id: Iaaa6d8de6e56138ed79cec3b038e75789ed7e562