Merge "Removing tracking activity start/stop events" into ub-launcher3-rvc-dev am: 0199fa46de

Change-Id: I44b41b253263630cc323f9e5cdb8c717dd6ef02d