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

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

Change-Id: Ibd160137db69acfebc2839c11958679360b649fb