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

Change-Id: I4aae5973e9b3efc4cf9e0ae6dd15f4b6871d87e3