Merge "[Angel] Add support for PendingIntents to SafetySourceData and address comments from ag/16182563"