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