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

Change-Id: Ia75de613314fcf7ff764090c833c9f4b440db6f1