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

Change-Id: Ie75f089b6b2d82e4b6f28d3cb5c71f3fb1f3d61d