Merge "codec2: Set custom ordinal for inputs processed by FrameReassembler" am: 5e3cf46b7f am: 437f549b00 am: fe3f8a720b

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

Change-Id: I3417525c19515807fdb3363d8b03b59de2e67b7a