Merge "Fixed tethering failed when device is on CBRS"
am: fa9c857b21

Change-Id: I1b17dc5f092f9a2480c2143c0594c18334f6071d