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

Change-Id: Ib10995dc727460a44801799447412f613eb0b17e