Merge "Improve javadoc description for recoverAndDeleteData()" am: 1744833dc5

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2135054

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