Merge "Fix NPE that netd callback call null TetheringConfiguration object" am: 4770588bc5

Change-Id: I5f6f86d01cf520759ab1be05867380d770fbf945