[automerger skipped] Merge "Start point for track sink frame map" into...

[automerger skipped] Merge "Start point for track sink frame map" into tm-qpr-dev am: 87d7226b am: 990a0613 -s ours

am skip reason: Merged-In Ib816b62a5724a0f48a449c2fdfdaa0b6936d710e with SHA-1 6cfb5938 is already in history

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



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