Merge "Fix Wireless debugging icon alignment on developer options screen." into sc-qpr1-dev am: 9dbe775f am: 949b3499

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15845730

Change-Id: I9d84b1a416705b30a8cca09b16a08bd84c35db8e