Merge "Return direct/offload corrected timestamps" am: 5e6c032e12 am: 338fe353bb

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

Change-Id: I67fdd0f71cf4f17735d6b598754797a0807203e0