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

Change-Id: I635dbc1b89c7e7458344f29979d5e62b37e2dd67