Merge "Fix Caption preview SubtitleView textSize cannot update correctly" into...

Merge "Fix Caption preview SubtitleView textSize cannot update correctly" into tm-dev am: c1228794

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17348586



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