Merge "Flatten the transitions to tethering and hotspot." into oc-dev am: 2d9a145115
am: 49d4ebd7ad

Change-Id: I9b2a42e9a94b9d43ba6c7de39820891da44a91f0