Merge changes I24a85a37,I8ad97414

* changes:
  [Wi-Fi][Tethering] Update summary string of "Turn off hotspot automatically"
  [Wi-Fi] Update android R strings