Merge "av: Support restore track for offload/direct track" into main am: 807baf46 am: 25beff80

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



Change-Id: I875d6f1a86897c3e99d6d9f8125fb5f8f050061a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>