Merge "Add getFlags and getSessionToken to MediaController" into lmp-dev