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

Change-Id: I3ce2246672d2261794ab71cdcc9011f1d696580c