[automerger skipped] Merge "Tethering: Add an exported flag in manifest" am: ec6cf543f9 am: d5b1f4c10f -s ours am: dd81ce4743 -s ours

am skip reason: Change-Id I25b55378df393cd4fb8932b7ae64f97eb9f1aa8e with SHA-1 af37b0a723 is in history

Change-Id: I677fbecc79dcfe3ba8bc5265e02288e4f2856a61
tree: 23b543517ec56bf74d69e24cee24eb562933143c
  1. Tethering/