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

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

Change-Id: I56bb49b76a6e4b77fead118cc61f8796de5f7e1c