Merge "Use correct columns for RCS_UNIFIED_EVENTS_VIEW" am: 6d66b771f0 am: cafd3b0e5c
am: e061a4cbfa

Change-Id: Ide50c081f97705423b7a285cc70496c14075013e