Merge "Add logging on UnfinishedStubbingException" am: f2ddb4151c am: e41baf1752 am: c25331f111 am: 0bb8639bc0

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

Change-Id: I027188a95e1c8397b78bcf4579767f1b2a36afda