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

Change-Id: I4ce96d8d6266a492da8edc217180097b0e548b0d