Merge "Rename caption resources for Desktop mode." into tm-qpr-dev am: 65e129f2 am: e7498c23

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



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