Merge "Fix tethering summary when airplane mode is off" into pi-dev
am: a07b1f83a8

Change-Id: I2f200d8f70e4f84906d0db4b9a3dd831d3278bfc