Fix a bug and add a feature for media resumption#2458

nift4 wants to merge 2 commits intoandroidx:mainandroidx/media:mainfrom

nift4:resumptionnift4/media:resumptionCopy head branch name to clipboard