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

Change-Id: I1231b6fdfb8373dd03ac34649769d90163063bf1