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

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



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