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: I193d53fa013a65fb458d9fa6e8e5b671366680c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>