Merge changes from topic "clean_move_and_delete" am: 0c155199c0 am: 3593d90f05 am: ae403db020

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

Change-Id: If057be6d0cd3dbb9e0f66622eeb0d8446345233b