Merge "Fix pairing dialog doesn't show the correct pairing key." into sc-dev am: 4f9d0f4eb4
am: dcc576eae5
am: 9b4f755505
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14730711 Change-Id: Id89ef68fa28119f99e005a218be8e07824cc22e5
This commit is contained in: