Merge "Add keys for preferred ESP packets type" am: 0609788851

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

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