[automerger skipped] Merge "[Tether14] Add tethering-client jar to whitelist" am: 74aa262eeb am: 68b515ad23 am: 2d04a90c80 -s ours
am skip reason: Change-Id I42c0f340d11045fbd8ae99fa60a467e643386eff with SHA-1 e14231d523 is in history

Change-Id: Idc0b352b0f956195c84a764f28ef474872531a54