Merge "Update tethering notification strings" am: 2d377066 am: 4f5ef756 am: 5d739b51 am: c02dca93 Change-Id: I85bba02377351bdf19562b27a645a142356371ca