Merge "TranscodingSessionControllerTest: Allow extra time to receive onError" am: e9bd2c8450 am: df58778f13 am: a0df991d40

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

Change-Id: I3befc51200b4eed28c83adce8a9f1db167b3eba7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>