[automerger skipped] Support dumping from given position and migrate code am:...

[automerger skipped] Support dumping from given position and migrate code am: 4602c37b am: ac22bef4 -s ours am: 8b945ba3 -s ours

am skip reason: Merged-In Ic4d51b6bacec08d93507aee9e0313d46afd3c0fa with SHA-1 4602c37b is already in history

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



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