[automerger] Add missing return check for short_term_ref_pic_set() am: 299cceb9e4 am: 2e8ae23656 am: 7ecb4083b9 am: 4fe71a567e am: 1561dc0fa9

Change-Id: I378a6e4f6f70931f36fd74acb02846096679e367