Merge "CCodec: Report error when display surface is obsolete" am: 573bbb3535 am: 46b0b7aa8c

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1491617

Change-Id: I913849728723f08ba7092b79d0377c80a46e3086