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

Change-Id: Id5a74c783ce62e5ce68369606ad19de8b8d45287