Merge "Merge "Add Demux/Descrambler request impl and test for TRM service" into rvc-dev am: 4e5b03b4 am: 2a0d5345 am: f670a898 am: 5c1ad49b" into rvc-qpr-dev-plus-aosp