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

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

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