Merge "Reset mExtractorInput on end of file" into rvc-dev am: c22866b592 am: 56de784983

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12009164

Change-Id: I1314a400eb98615c3c254dcf56cf3eef3a2d0128