Merge "Fix phone shows incorrect pairing code in pairing dialog" into...

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

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

Change-Id: I66aa7fbc7a99be29c59b89733aa1650f22129e12