Merge "Update caption on shell flag default value" into udc-qpr-dev am: 9dd43f65

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



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