Merge "Re-evaluate IPsec packet loss on LP/NC change" into main am: 9a885d7439 am: 617aa47b85

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3008913

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