[automerger skipped] Merge "Add TETHER_PRIVILEGED permission to shell for CTS test." am: 30642b395c am: b2384e4850 am: 5faef1b60a -s ours
am skip reason: Change-Id Ifad265cdc5e0b1b1b2fa8f4f79eeb7dd18493624 with SHA-1 a2ce459f65 is in history

Change-Id: Id0a6e62eaa0c54192e4bf68ae5fe4181c8f2798b