Merge "Merge "[MS32.1] Remove TetheringManager#ACTION_TETHER_STATE_CHANGED usage" am: ac674f3b am: 335b1507 am: 4671dcf3 am: 3cdffdce"