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

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



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