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

Change-Id: Id7d190a4a8db19151c9face80cd61b1eb2408194