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

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

Change-Id: Iab0d5bbe8ebf71b06a7f234085bb896e1a9f4d6d