[automerger skipped] Merge "Tethering: Add an exported flag in manifest" am:...
[automerger skipped] Merge "Tethering: Add an exported flag in manifest" am: ec6cf543 am: e81da2d8 -s ours am: b79ee214 -s ours
am skip reason: Change-Id I25b55378df393cd4fb8932b7ae64f97eb9f1aa8e with SHA-1 9befafe1 is in history
Change-Id: I677fbecc79dcfe3ba8bc5265e02288e4f2856a61