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

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

Change-Id: I47b4c34c83146b3e272010926febc018d6a207a2