Merge "Expose some tethering constants in Settings" am: 07dcca55fc am: 2173a4d07e am: b8a97000e9

Change-Id: I0a6e91e6f33924ef181033faeb755c8cc123b94b