Merge "Fix testStartTetheringWithStateChangeBroadcast flaky" am: 83669b02f3 am: 85529a4fb6

Change-Id: Ic7a6855428ae03556a35061d1d5e07a8029ef373