Merge "[RCS] Add triggerType for onNotifyUpdateCapabilites" am: 6489e5328f am: e504547de4

Change-Id: I1f86dc1ea1475741628b01dc3ee390f4d3018827