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

Change-Id: I09520c603482b55ae4f360309f7b1aa12ac74724