Merge "Start point for track sink frame map" into tm-qpr-dev am: 87d7226b

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



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