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

Change-Id: Ic43120a6538468eee803682cccf3d20cd16ef5ea