Merge "Add parameter for sideloaded caption formats" into rvc-dev am: a99dba8b

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

Change-Id: I2841d74545695075b2f9909d285d309bc39852c9