[automerger skipped] Support dumping from given position and migrate code am: 3f2a54f2 -s ours

am skip reason: Merged-In Ic4d51b6bacec08d93507aee9e0313d46afd3c0fa with SHA-1 67855e66 is already in history

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



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