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: I7296932960e5a3b2d71594f8625d8dfe627cb504