Merge "Fix ClearKey session leaks" into rvc-dev am: 8d2942ed96 am: 390ae900d7 am: 1e140df985 am: 97359e393e

Change-Id: I7958e27eb98b353d034d420dea0fa79641fa0395