Merge "Tethering: switch to use tethering package resources" am: 49b8c99f2c am: 01224e019f

Change-Id: Ia84936fc199d02635f0df4288918c7f4659caa97