[automerger skipped] RESTRICT AUTOMERGE SoftHEVC: Handle error in reInitDecoder() skipped: 169e6aca16 skipped: 2a2076c019

Change-Id: I0b76e25c8457cc8aa9db5ed6952943231f3d61ef