Merge "Merge "Add sleep to avoid calling stopLocalOnlyHotspot before TetherController initialization." into pie-cts-dev am: 4d452396c9"