Merge "Add logging on UnfinishedStubbingException" am: f2ddb4151c am: e41baf1752

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

Change-Id: I612f1e6631ca2a8193ae32d2079128ca3d726f9c