Merge "Improve error message when testing network factory" am: e8cd6e4fef am: 324e0f161a am: 795ef23ed8

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1531798

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4b421f7b2895a24912d37d73dc011fa440440cf2