[automerger skipped] Merge "[adb-wireless] Add Wireless Debugging Switch in Developer options." am: 317c9dc2ca
am: fd2e26d4aa
am: 44f654fe43
-s ours
am skip reason: Change-Id I188badb43035172642cf235bb27e56d3a1dea169 with SHA-1 85a65e2dc6
is in history
Change-Id: I522ee7e1b07c0ab77f0cf230d1508e0bf9e479dc
This commit is contained in: