[automerger skipped] Merge "Add Ethernet Tethering settings" am: 526741a2f2 am: 2b54956856 -s ours am: 6181c64279 -s ours am: e4a5220c80 -s ours am: 21663a0bf7 -s ours
am skip reason: Change-Id Ia4f365ddc1a53a926d716046db3e6ac463c978b9 with SHA-1 557e457278 is in history
Change-Id: Iebd90462fdf3bfae8ba9cc07cb78a4850075c5e8
This commit is contained in: