Merge "Add parameter for sideloaded caption formats" into rvc-dev am: a99dba8b am: 4d21c064 am: ee3c9da3 am: d901542c

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

Change-Id: I6c6f731a8ba7e9bc0d8b9b4046ad2cfb315bac82