am d3d62f2d: am fa14d824: Merge "Move and rename user activity event type constants." into jb-mr1-dev

* commit 'd3d62f2d06652cd311363809b6bb25bf9776d1d3':
  Move and rename user activity event type constants.