Merge "Revert "Make WatchedFramePop instrumentation event pure-virtual""
am: 0c277f2285

Change-Id: Icb49818e7ffe823ce87dc8a8c198a29e7f7bc837