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

Change-Id: Iaa1da0421343daf29ecfd930112931bb9095bd93