Merge "Add config_tether_* and entitlement resources"
am: 2a27a6ade1

Change-Id: I57bbcb4532fe752c901390d98308f92a13b7c6ae