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

Change-Id: Ib3c65fab121035ddfbd1e40a0320dd7c58558be8