Merge "C2 Vts: Avoid using strings to pass integer and bool values" am: 7d50550bc3 am: 4d595a257a am: 0c12420856

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1663223

Change-Id: Ie0f5c3973adf8ef5581673a23990137c3e74906f