Merge "MEDIA_PLAYER_STATE_ERROR is not a bitmask (b/2502881)"