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

Change-Id: Icbc6f0340ea623dae9416c6699f79981d77ae2ea