Merge "Revert "[Media ML] Add button session management related classes"" into rvc-dev am: 628f8bc3 am: dd1eac6a Change-Id: I2155018e609d4ead653a8b9ce88b56660fe1b6bc