Merge "Tethering: check if configManager is null" am: e011bf80c5 am: d1e4dbf002 am: d33a0ee710
am: e0a27e855b

Change-Id: I0c1fc0ca1458a322a1d225d6271c5616d00b2b50