Merge "Introduce a flag to enable shell caption" into tm-dev am: 771ed53f

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

Change-Id: I30c54f7177777ba7e898261b41079d1a5a33d6d2