Merge "Revert "[Media ML] Add button session management related classes"" into rvc-dev am: 628f8bc353 am: dd1eac6a6c am: 31aa914e07 am: 4f0bce568b

Change-Id: Ic436bccfd9eefc9997165e91b38f637a7a57ea80