Merge "Merge "Add parameter for sideloaded caption formats" into rvc-dev am: a99dba8be0 am: 4570870c2b am: a2eab0abc7" into rvc-qpr-dev-plus-aosp am: 2283af6217

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

Change-Id: I210849ca8e82316fc47556016502955e8415e58f