Merge "Remove singleline for the nearby devices textview" into tm-qpr-dev am:...

Merge "Remove singleline for the nearby devices textview" into tm-qpr-dev am: 093d543c am: 49c535ab

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20197328



Change-Id: I07fffe208fa710da5e9e0b6a7a976c7a38053f7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>