Merge changes from topic "clean_move_and_delete" am: 0c155199c0 am: f4f994e138

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

Change-Id: I725958b2a27b4059a83985521bfb187289b387db