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

Change-Id: I1e89bd103c3886a48eeba4cb454845bb01f232f3