tree 6563c4a63a7e3247f5c13b80b8507de14748356c
parent f6e64a6a9c58e8630a2a75a7470b950bf1af0781
parent 91db3e114090e808eac185c339e3d7bccc88ddf3
author Yan Yan <evitayan@google.com> 1715105467 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1715105467 +0000

Merge "Support disabling IPsec packet loss detector" into main am: b3a939eb82 am: 91db3e1140

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

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