[automerger skipped] Protect frame counters in device_port_source am: 5357dcd409 am: 9401b7b1c1 am: 9fe586d4bd -s ours am: 69a1256f2f -s ours

am skip reason: Merged-In Ia4c1f85a93f57df065516e2d946b80d24c54007d with SHA-1 5357dcd409 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/generic/goldfish/+/18971364

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