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

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



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