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

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

Change-Id: I531ee79ff05db24edef1d2a0bba518b356a0e043