Merge "Device picker: add title to fix offset in progressbar" am: a3da419c8d

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

Change-Id: I966b9ede97c0d3e997b96dc012ffdd6476688448