[automerger skipped] Fix an issue in TrackRecord. am: 768d586c am:...

[automerger skipped] Fix an issue in TrackRecord. am: 768d586c am: 9b2ec350 am: 3ac07155 -s ours

am skip reason: Change-Id Ie9eb4d7158e9583d4052e86f87062e3032b023e3 with SHA-1 768d586c is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/11204385

Change-Id: I4745e0d844441f4f0551d3f4891d209d4e5e277f