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

Change-Id: I85b0a97898ccd5898e6458e453b69885a756c0be