Merge "C2OMXNode: read delay from component to determine buffer count" am: 68ca207ba6 am: 233058f34e am: 003f41fa9a

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

Change-Id: I02d04636e37f672bc9fea0b148aaef8a0c2c64c4