[automerger skipped] DO NOT MERGE: SDP: Check p_end in save_attr_seq and add_attr
am: 9299b79e -s ours
am skip reason: change_id Ib642f79ed22b65ede5ff786cb1e163d172480f11 with SHA1 36f01657 is in history
Change-Id: I73d7f92b5dc4ab723c721edbc53131e8be6c3d79