[automerger skipped] Merge "[adbwifi] Add Settings metrics for adb wireless." into qt-qpr1-dev-plus-aosp am: cbfb6a9221 -s ours
am skip reason: Change-Id Ib18cefda42fd778f5868ba63007b0b18e83e2c4d with SHA-1 5e931c7e2e is in history

Change-Id: I8c6f3be311600528de50b842e91437bc30b8318d