Merge "Move caption view constants to resources" into tm-qpr-dev am: 74e9e231

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



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