Merge "Update maximum length of device name for WiFi direct settings" into...

Merge "Update maximum length of device name for WiFi direct settings" into tm-dev am: b2eb7312 am: 2e8ae94d

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



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