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

Change-Id: I03a5362d581b573aa90178c8b34e22c4c790f106