Merge "PatchTrackBase: fix null pointer dereference issue" into main am:...

Merge "PatchTrackBase: fix null pointer dereference issue" into main am: f427b33f am: b4027c3d am: 973a4465 am: 0ba45af0 am: 8aa9a576 am: 01816b29

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



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