[automerger skipped] Merge "Add permitted_packages to framework-tethering." am: 5ede7b15e3 am: 866dcfbbba -s ours am: 67aa40bdd1 -s ours am: 308a623d81 -s ours am: d3e6b6d0d0 -s ours
am skip reason: Change-Id I248c36b2cf2f5776978c4fd2322d3b73ade309ff with SHA-1 c8ad37247f is in history
Change-Id: I962962753afcd92d30db5b772ff67d4623efc801
This commit is contained in: