Merge "Fix dead lock in Tethering state machine" am: 355dbae680 am: 0703f03953
am: 83385ed04a

Change-Id: I7d0974d5ec4e3cab1581e1cce0e01eeb6bf7448a