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

Change-Id: If05cbd147cfa8215d11f7646c52fa0c8f1276070