Merge changes from topic "clean_move_and_delete" am: 0c155199c0

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

Change-Id: I498f30f532451eb05f584b464f62dc08c21d63ac