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

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

Change-Id: Ib9c0224099e483723bd85cb8da081615c6364f54