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

Change-Id: I258837613e87498912c704ae25520a22ada42ea9