Merge "Merge "Fix MediaCas CTS failure TRM is checking input parameters and won't allow null executor. Use context main executor to call Tuner Resource Manager (TRM)" into rvc-dev am: bdc05af123 am: 0b7ea54a86" into rvc-d1-dev-plus-aosp am: 121269f25e am: c3f6e77b99

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

Change-Id: I2ce003e8d3cf75af6d3718cca291e8a937f1b910