[automerger skipped] Test setting proposal, TS and lifetime for ChildSessionParams am: 2b98dce4e9 am: 5ee6a62fd1 -s ours
am skip reason: Change-Id If19fb12c92f65d487478fda172acb21f6cfb1717 with SHA-1 6f4d0a0d64 is in history
Change-Id: I974e69baa964ed879dc1f0a8dd18293553b80273
This commit is contained in: