[automerger skipped] Merge "[adbwifi]: Add Settings metrics for adb wireless." am: 5ff37df1ab -s ours am: 5e4c2f7898 -s ours
am skip reason: Change-Id Ib18cefda42fd778f5868ba63007b0b18e83e2c4d with SHA-1 2ebefbd0dc is in history

Change-Id: I8affec693a54a64c535c345fd8524751185ebb25