Merge "Fix phone shows incorrect pairing code in pairing dialog" into sc-v2-dev am: 3f5d3cc0f3

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

Change-Id: If4876e9ebcfc670202d73a03d96a4632850546f4