Merge "Revert "[Media ML] Add button session management related classes"" into rvc-dev am: 628f8bc353 am: dd1eac6a6c
Change-Id: Ie502e7ab4acb04afb012e176beb05d945e3e6e73
This commit is contained in: