Merge "Merge "Add Demux/Descrambler request impl and test for TRM service" into rvc-dev am: 4e5b03b43c" into rvc-dev-plus-aosp am: c1b350cb1b

Change-Id: I267b1b80b51f2a8003e41363613265fdd6262830