Merge "Fixed tethering failed when device is on CBRS" into qt-r1-dev
am: 070e64b1e5

Change-Id: I3c88b6524d6922bfc8d43a889363471b07242a50