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

Change-Id: Ia7d81340cb525cb77943811d4a104f40ea431250