Merge "Specify whether or not the disconnected string should be used" into...

Merge "Specify whether or not the disconnected string should be used" into tm-dev am: 01f7e54f am: f1b9ae09

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



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