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

Change-Id: Ie0dcc60f0a85a0be8bfd7511d01267b3eebc8d66