[automerger skipped] Merge "[adbwifi] Add Settings metrics for adb wireless." into stage-aosp-master am: 54701eab76 -s ours
am skip reason: Change-Id Ib18cefda42fd778f5868ba63007b0b18e83e2c4d with SHA-1 5bc3c58134 is in history

Change-Id: Ibe601a5fd474fcdb858fe5ee60bc8996e627e0c1