Merge "Flatten the transitions to tethering and hotspot." am: af5f00ee5e am: 22b9eb972e am: b86a7e8d3a
am: 76dad19cde

Change-Id: Ifbcee902811b024eb2444881796726b6a3221929