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

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

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